Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 27 May 2011 17:02:07 +0000 (10:02 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 27 May 2011 17:02:07 +0000 (10:02 -0700)
commit6f0c9b3020e637770fe22691331ba03c215b0782
tree2419425940b2d7fe3e897cfb021ab7c9c249ae4c
parentad5a94830aefa83fdeb161a9461e812acc5bfe28
parent9c32674cf00ec1e82d09941c5b67f973ff5a93d7
Merge from trunk.